From 22cc54a6377ede6f210905ec13d62f8b5e828f94 Mon Sep 17 00:00:00 2001
From: Nicolas Koch <nioko1337@gmail.com>
Date: Mon, 31 Aug 2015 12:24:49 +0200
Subject: [PATCH] Make ::can_panic() return true on x86_64-pc-windows-msvc

---
 tests/test_cargo_test.rs | 1 +
 tests/tests.rs           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index 7d395650f..ab29bcc47 100644
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -1857,6 +1857,7 @@ test!(dev_dep_with_build_script {
 });
 
 test!(no_fail_fast {
+    if !::can_panic() { return }
     let p = project("foo")
         .file("Cargo.toml", r#"
             [package]
diff --git a/tests/tests.rs b/tests/tests.rs
index 570267a33..15f9cde7c 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -74,5 +74,5 @@ fn is_nightly() -> bool {
 }
 
 fn can_panic() -> bool {
-    RUSTC.with(|r| !r.host.contains("msvc"))
+    RUSTC.with(|r| !(r.host.contains("msvc") && !r.host.contains("x86_64")))
 }
-- 
2.30.2